bitkeeper revision 1.1159.1.394 (4190a152C0zjusRSriDG4srGifYk1A)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xen.bk-smp

diff --cc .rootkeys
Simple merge

diff --cc xen/arch/x86/traps.c
index 53906b5d3d4ce0c366185a075ac8b5349e942623,b15939d6cfa789fc77649e9b5740af96428b00a6..6164b15177f225953662eacd005fa31836d21137
--- 1/xen/arch/x86/traps.c
--- 2/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@@ -374,10 -382,10 +383,10 @@@ asmlinkage void do_page_fault(struct xe
              return; /* successfully copied the mapping */
      }
  
-     if ( unlikely(!(regs->xcs & 3)) )
+     if ( unlikely(!(regs->cs & 3)) )
          goto xen_fault;
  
 -    ti = d->thread.traps + 14;
 +    ti = ed->thread.traps + 14;
      gtb->flags = GTBF_TRAP_CR2; /* page fault pushes %cr2 */
      gtb->cr2        = addr;
      gtb->error_code = error_code;
@@@ -392,10 -400,9 +401,9 @@@
      if ( likely((fixup = search_exception_table(regs->eip)) != 0) )
      {
          perfc_incrc(copy_user_faults);
 -        if ( !d->mm.shadow_mode )
 +        if ( !ed->mm.shadow_mode )
              DPRINTK("Page fault: %08lx -> %08lx\n", regs->eip, fixup);
          regs->eip = fixup;
-         regs->xds = regs->xes = regs->xfs = regs->xgs = __HYPERVISOR_DS;
          return;
      }
  

diff --cc xen/arch/x86/x86_32/seg_fixup.c
Simple merge

diff --cc xen/include/asm-x86/x86_32/current.h
Simple merge

diff --cc xen/include/public/dom0_ops.h
Simple merge

diff --cc xen/include/xen/sched.h
Simple merge